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

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



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