Merge changes from topic "presubmit-am-8424428ed6224c37a73d80ed9709589d" into sc-qpr1-dev am: e5e79a46c4

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

Change-Id: I3107f5af17e9d139244fa9c8070bfc627c530576