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

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

Change-Id: Ifd9a6d343570c31b0b78b990c7639fadd53b72da