tree fd259842d0a6ab2e692799e94fb2234c188b9fcf
parent 3a43186e4e3cc14be8e463339bfdc94c3c7d1c60
parent db7f99a8fe81ea76d396646bfa24ac59129de16f
author Calvin Pan <calvinpan@google.com> 1594912572 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594912572 +0000

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

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

Change-Id: Idfbd81ae7dfb71f964de208dc32d2fb7c1414a26