Merge changes from topic "presubmit-am-3dd8456477cc4638bd44cc60d1a43b48" into sc-mainline-prod am: a9464df35c

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

Change-Id: I8509bde4cb568737027da384a3252d4a5ed5b267