[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 78773d99f6 -s ours

am skip reason: Merged-In If96bb6471ded7d7ecc1b3a57e2da72ede393f5a7 with SHA-1 40b358dcea is already in history

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

Change-Id: I72e7886df8a37f6d9ef14c24e4b5f671e541bd4d