[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 63c9c4d0 -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 63c9c4d0 -s ours am: a207ea53 -s ours am: fe12c98c -s ours am: b779816e -s ours

am skip reason: subject contains skip directive

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



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