[automerger skipped] Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" am: 8ec6343dfb am: d81fc9d312 am: 8f04c7b7f3 -s ours

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

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

Change-Id: I7ca52d4a07a276264d4634a5ccf26776a31c8bfc