Merge changes from topic "presubmit-am-8d7a060222da4a76a9dee07318c1e3dd" into sc-mainline-prod am: 4eea2c83ee

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

Change-Id: I96054c4e4a475f542e35508a002afc7b6285e179