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

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

Change-Id: Ia709449435864f6d1480a1a304f426cd7e0e8391