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

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



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