Merge changes from topic "presubmit-am-0628dd74d0ee4330bb22aa60c8705379" into sc-qpr1-dev am: 40745f7777

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

Change-Id: I2d17e0ae0c7327596b2fae341f160ba36b55ce4b