[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 skip reason: Merged-In I2a5adb619566feb427c0538fb36578f671d9980d with SHA-1 0a6dbf64 is already in history

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



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