[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d5a5a24ff5 -s ours am: 9770817982 -s ours am: 72c5cd4201 -s ours am: eedf790434 -s ours

am skip reason: Merged-In I943cf84e7d4f50f65e4db66297a1cfaeec80f1d2 with SHA-1 d7a1c69202 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/15571832

Change-Id: Ia776d100f3b8576678467d663a1b8986649fccc1