Merge changes from topic "presubmit-am-2a20635060c64742b5bb41293b99e808" into sc-qpr1-dev am: 6ce946234b

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

Change-Id: Ifdfd3fbe17b4a48de17bcf5281db2083bcd34858