Merge changes from topic "presubmit-am-a127b25652e84cbbbbc7fa6d6dbb96ee" into sc-mainline-prod am: c9adbf3c

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

Change-Id: I549166bba86275586bc1760d45fc29f17d6ac748