[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 3fe06d20e6 -s ours am: 9538051ebf -s ours am: f25b99ca49 -s ours

am skip reason: Merged-In I430bba6daddb35e6280b4fe7146551f9ec661e67 with SHA-1 97547d7ef8 is already in history

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

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