Merge changes from topic "presubmit-am-7712c5585b7e48228448d26451230f68" into sc-qpr1-dev am: 3e4ff0e686

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

Change-Id: I6fdb29b656a73f6c9ec97aee2f425102d066717f