[automerger skipped] Merge "Update TelephonySubscriptionTracker to use new...

[automerger skipped] Merge "Update TelephonySubscriptionTracker to use new CPCallback interface" am: f146ee5a am: 66d19b9f am: c3f28b77 -s ours am: 1e0618ac -s ours

am skip reason: Merged-In I58dbbc4b7b135781bc5f4b5bc35b29075fc6a619 with SHA-1 374f0045 is already in history

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

Change-Id: Ia2800566769b968dc19cb1c0d9fd23c1484e6b4d