[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 6b68206bd5 -s ours am: e19c879b8d -s ours am: eecb8ddc7e -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: I76b95f46f5e4d780c4efd6de738eba28cb4a03c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>