Merge changes from topic "presubmit-am-3dd8456477cc4638bd44cc60d1a43b48" into sc-qpr1-dev am: d7b9ea1b73 am: 4a3617401f

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

Change-Id: I85a5ade10b45a5091b423f1d9bdf381b8ba771db