Merge changes from topic "presubmit-am-2855d78c46c041478f4ef4d118600632" into sc-mainline-prod am: bada13a0af

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

Change-Id: I16c701e647794e2b0a0a5ec4ca20d4519c779b46