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

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

Change-Id: I637be7bd984b429691f9fe58a0001db27d4f9f0e