[automerger skipped] Merge changes I81fcee3c,Ib149939d,I18957758 am:...

[automerger skipped] Merge changes I81fcee3c,Ib149939d,I18957758 am: 5a14644d am: 2498d822 am: 70a4ba35 -s ours

am skip reason: Merged-In I81fcee3c65b72729fadf4216afc5365c464d4abd with SHA-1 0c22cfac is already in history

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



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