Merge "Improve carrier id testability" am: d4d2391c9c

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

Change-Id: Ie67871035682f48cdebaf4933ce17366c312503e