Merge changes from topic "presubmit-am-1f01c9dc2f8f451491b98b0795465b8a" into sc-qpr1-dev am: 9480ee9b0a am: 2cfa53ffec am: 1afdb70214

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

Change-Id: I60f8e7d263de678bdf8952c4e510a481bbfb8ffb