Merge changes from topic "presubmit-am-0e8c3e49cbcc43369053ec3ea835242e" into sc-v2-dev-plus-aosp am: 4164a49302

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

Change-Id: Id5297f95f1124c95996975c5dbc6ab1e554b5fe3