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

Merge changes I92a4ef47,I92039a19 into tm-dev am: ac2635c4 am: fa560988 am: fa0c6118 am: 0819a6be

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



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