Merge changes from topic "presubmit-am-7712c5585b7e48228448d26451230f68" into...

Merge changes from topic "presubmit-am-7712c5585b7e48228448d26451230f68" into sc-qpr1-dev am: 3e4ff0e6 am: 58e51c21 am: e62ecc85

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

Change-Id: I2bc7f9df80b2ca0f51cd250c0b01e688aee8432b