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

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