[automerger skipped] Merge "Update SubscriptionInfoUpdater to use...

[automerger skipped] Merge "Update SubscriptionInfoUpdater to use TM#getCarrierServicePackageName" am: 7218df4e am: 3c7a2973 -s ours

am skip reason: Merged-In I3545bd3b807c9efe5ea525b0bf6ebde42386486a with SHA-1 d89bc9d4 is already in history

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



Change-Id: I15cefbaa89fa6100d7e1e5a2fcc239ef2eb59888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>