[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 2c46eb49ba -s ours am: 962cc81efe -s ours am: d1ab80c827 -s ours

am skip reason: Merged-In I59bf732b7ef44ea583fad3e5612d95edb8a4afae with SHA-1 35d754f3eb is already in history

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

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