Merge changes from topic "presubmit-am-d987d9e3a2c343908096ebb23a58f46c" into sc-qpr1-dev am: 8a1f6577bb

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

Change-Id: I3e743fa22e2a3ea8237db0910eb737d8d8e0795a