Merge changes from topic "presubmit-am-8424428ed6224c37a73d80ed9709589d" into...

Merge changes from topic "presubmit-am-8424428ed6224c37a73d80ed9709589d" into sc-qpr1-dev am: e5e79a46 am: 6f5426d0

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

Change-Id: I98eddef7c6abdc1f73389d036b99e143581f5872