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

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

Change-Id: I29fc0bc831dce84b62f0deb0a8adc91952ac1a18