[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: e3f79d4f -s ours

am skip reason: Merged-In Ie8680285cde8a27c722df99d03cf1d795ea21db1 with SHA-1 9f3ac92e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2130192



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