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

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

Change-Id: I7aca93471d5f650c05c0d35fe31b6d538379c5c0