[automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: f1b89d53b9 -s ours

am skip reason: Merged-In I632035de9cfc69401857a21299cb210ed65081d8 with SHA-1 78a048ac39 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/20874086

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