[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 744cf757 -s...

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