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

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

Change-Id: I3bd6b1261fe070f51e3b693464457770cbed73a8