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

Merge changes I026a4d71,I88e2284a into tm-dev am: 229cbaf2 am: 12345f9a am: c8277b00 am: 8e68434c

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



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