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

am skip reason: Merged-In I823c57b06078ae8d322e950e556d4cb47b83e62d with SHA-1 4f569245 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2294304



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