[automerger skipped] Merge changes Iabfa73c7,Ibeccad57 am: 7bba7343 am:...

[automerger skipped] Merge changes Iabfa73c7,Ibeccad57 am: 7bba7343 am: 297f17c1 am: 0321aef1 -s ours

am skip reason: Merged-In Iabfa73c70e344b4f49950a9a495edf6f00f8b144 with SHA-1 ebec0dd3 is already in history

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



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