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

am skip reason: subject contains skip directive

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

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