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

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

Change-Id: Idd8975fcbe9f4a6e24e87050cd4febc71ce0360b