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

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

Change-Id: I2a8595f489322557fa4859ad24cd4ae4c0f116ac