[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: bca31f8e -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: bca31f8e -s ours am: b9b88ef4 -s ours am: fc2a4353 -s ours am: 851a9840 -s ours

am skip reason: subject contains skip directive

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



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