Merge changes from topic "presubmit-am-1696206424e74ea1876042bb4d49b6af" into sc-qpr1-dev am: 3418c85faa am: 52585aca83 am: 648b2f36b3

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

Change-Id: If4ac93e409ad26e43b22c9d419603229d69aa821