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

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

Change-Id: Iee732918b4dd9575e09446b5d8f6a7cc31000af2