Merge changes from topic "presubmit-am-715432792cf148d895e250b283288a3f" into sc-qpr1-dev am: fe0e93cfce

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15743277

Change-Id: I19bbb32a087fc86287bfb06d1e0a375486515e13