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

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



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