[automerger skipped] Merge "Optimize getCarrierServicePackageName in...

[automerger skipped] Merge "Optimize getCarrierServicePackageName in CarrierPrivilegesTracker" am: 8b12ed94 am: 67ae8420 am: ec33278d -s ours am: 0aa19790 -s ours am: 4b433898 -s ours

am skip reason: Merged-In I2163fac6c371a706e565050ea6ad066cbca8f588 with SHA-1 bcf5d849 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2039183

Change-Id: I3768ca7d86a68948d1efd57c80b9a1bf505cd5f1