[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 81307e2146 -s ours

am skip reason: Merged-In Ib8c8e4ff1e6b7353529476ccb89827cb97bf8891 with SHA-1 9a22dc5f84 is already in history

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

Change-Id: I24388507ba6c6b25fc805ecdd9384436c305d013