Merge changes from topic "presubmit-am-c77a0e3c5b914a1badbb2383c95ada3d" into sc-v2-dev-plus-aosp am: 330d5eadef

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

Change-Id: I3c704b0cb1b7d8f5b11fbe2cf2fedf4d2f443113