[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am:...

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 7be81454 -s ours am: a38e1c38 -s ours

am skip reason: Merged-In I4b3d13d5c7050d07a3e3fcb6de38c4effc77a296 with SHA-1 61982956 is already in history

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



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