Merge changes I92a4ef47,I92039a19 into tm-dev am: ac2635c4 am: 0b9ffd00

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



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