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