Merge changes I832ddcc8,Id54258d0 into tm-dev am: 3cfa5c66

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



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