Merge "[automerger skipped] Merge "Update TelephonySubscriptionTracker with...

Merge "[automerger skipped] Merge "Update TelephonySubscriptionTracker with new CarrierConfigManager APIs" into main am: b7b43f6a am: 6fbd2717 -s ours" into udc-dev-plus-aosp am: 1dcf8495 -s ours

am skip reason: Merged-In I93f14421624ac76bdf84c06cfd4c067bf2ccde7a with SHA-1 628147b7 is already in history

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



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