[automerger skipped] Merge changes I16a9f413,I153bd511,I76f52a44,I5d9b3860 am:...

[automerger skipped] Merge changes I16a9f413,I153bd511,I76f52a44,I5d9b3860 am: bde4d599 am: 5009f4f7 am: 310aec61 -s ours am: dc1b94dd -s ours am: 43e959b1 -s ours

am skip reason: Merged-In I16a9f4137775d6a2e3606f6ea36d5dadde265ee7 with SHA-1 9c4a76a2 is already in history

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

Change-Id: Id20be20993d192c8531b867b7b29c0a4ae22bfd3