[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: 010fdce7 -s ours am: 0bd65a47 -s ours am: 1f365cce -s ours

am skip reason: subject contains skip directive

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



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