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

[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: b8939a85 -s ours am: 19059a42 -s ours am: 25052033 -s ours am: cf07c2d6 -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: I5e8ee0a76db99f6d10468066707ccd4b35e505ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>