Merge changes from topic "presubmit-am-a127b25652e84cbbbbc7fa6d6dbb96ee" into sc-qpr1-dev am: bb700059af

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

Change-Id: If247e97232560b0ec722b92c27c014ddb086cf04