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

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



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