[automerger skipped] Merge "Optimize...

[automerger skipped] Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" am: 8ec6343d am: d81fc9d3 am: 8f04c7b7 -s ours am: 9dc8e3b2 -s ours am: cf95baac -s ours

am skip reason: Merged-In I29df8599bdfc84cab330fa7056a228997a4bac0f with SHA-1 28b2ee8e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2039223

Change-Id: Ib363d6b546fe01951b47a9cb92d1c1111d95d9af