Merge changes I026a4d71,I88e2284a into tm-dev am: 229cbaf2 am: b3b654b1...

Merge changes I026a4d71,I88e2284a into tm-dev am: 229cbaf2 am: b3b654b1 am: a6b44dc3 am: 6d33091b

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



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