[automerger skipped] Merge "Merge TP1A.221105.002 to aosp-master - DO NOT MERGE" am: 9635ffd93a -s ours

am skip reason: Merged-In I4f6343abbe6d798b2b6633bde1df62d28686a7f2 with SHA-1 c79808b14a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/2293344

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