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

[automerger skipped] Merge "Update TelephonySubscriptionTracker with new CarrierConfigManager APIs" into main am: b7b43f6a am: 6fbd2717 -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: I3e77322883e6774983a8da0eb7bb1f9f441d8347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>