Merge changes from topic "presubmit-am-a75f97b0364e4489a0ca6ad6095cc903" into sc-mainline-prod am: 62cb02b4

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

Change-Id: I36e7fb5fbef34f0ba4b6b15ff61c6090fd7161ee