Merge changes from topic "presubmit-am-02628289f6424136a35d78ef5bb4c647" into sc-qpr1-dev am: cafda2a9fb

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

Change-Id: If3f55c334420f3eb2b3a29bf8a08cf61dad937d3