Merge changes from topic "getCarrierServicePackageName_aosp" am: 79fc5b66f6

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

Change-Id: Iff08e39f147788d0184519d806ac7ee687500715