[automerger skipped] Merge changes from topic "getCarrierServicePackageName_aosp" am: 79fc5b66f6 am: 818e30e139 am: b1dcb02043 -s ours am: 8a60f8f322 -s ours

am skip reason: Merged-In I8f5a9bfcab9c5923eada8a4abb336d347568d223 with SHA-1 6812ffbcc5 is already in history

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

Change-Id: Ib6b4704c1a30d4fafc911cb49824fa6388cdfb57