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

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

Change-Id: I56ee1ccd52ecb5f08c6a0c01e815a2f256ed70cd