tree fd259842d0a6ab2e692799e94fb2234c188b9fcf
parent d0d2d18b2996b6b6abd310306351afa047502b51
parent eac2933f403820c8793ce0ff083b612d713adb18
author Calvin Pan <calvinpan@google.com> 1594911294 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594911294 +0000

Merge "Improve carrier id testability" am: d4d2391c9c am: eac2933f40

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1347084

Change-Id: I180ec2811830c58219308ec39a7426c2e4062324