Merge changes from topic "presubmit-am-2855d78c46c041478f4ef4d118600632" into sc-dev-plus-aosp am: f99fbd299d

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

Change-Id: I8cd87a7002ec6a2fd0b04027a438b6aaffd20f8f