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

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

Change-Id: I89605d3772c912dad9af66dbd209f60e45d45b38