[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 skip reason: Merged-In I1f5503d2420f6e8449adadc6bc4100a37f35251a with SHA-1 9b928674 is already in history

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



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