[automerger skipped] Merge changes I0dc4641d,I99a304e7 am: d8463463 am:...

[automerger skipped] Merge changes I0dc4641d,I99a304e7 am: d8463463 am: cdc9e46e am: 497abd21 -s ours am: 63f186ed -s ours

am skip reason: Merged-In I0dc4641dab2bdb64475e83cd130de5cb1ecf6c30 with SHA-1 64ba97f0 is already in history

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



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