Merge changes from topic "presubmit-am-8d7a060222da4a76a9dee07318c1e3dd" into sc-qpr1-dev am: 4f22a124ea am: 25394a0bf9

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

Change-Id: If79fe11c4aa70fdff06ff9e7bed854cac0d8a5fa