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

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



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