Merge changes I92a4ef47,I92039a19 into tm-dev am: ac2635c4 am: e5446396 am: e41b6f0a

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



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