Merge changes from topic "getCarrierServicePackageName_aosp" am: 79fc5b66f6 am: 818e30e139

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2039004

Change-Id: Ibeb8037ef2bcf2361bcb08945d254573bf22871f