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

Merge changes I026a4d71,I88e2284a into tm-dev am: 229cbaf2 am: 12345f9a am: 7ab8c7b8 am: 66c5b6ab

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



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