Merge changes from topic "presubmit-am-4a196505e7784256b7c2d4af8313e491" into sc-qpr1-dev am: 12efaeb75a am: e5aa3d02c6

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

Change-Id: I2d980da9771f4f120c6539c4cc71495fe8346163