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

[automerger skipped] Merge "Update SubscriptionInfoUpdater to use TM#getCarrierServicePackageName" am: 7218df4e am: 3c7a2973 -s ours am: 1663a73b -s ours am: fd6b2cac -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: I6d0e7fd23f3fe24edc1204fcaef91740af5a6333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>