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

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

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



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