[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: d78ef43a1d -s ours am: 86c1af9d9f -s ours am: efdf336986 -s ours am: 394a97f19e -s ours

am skip reason: Merged-In Ibe6ead59b647b0983516e648d2848e2daa56bf31 with SHA-1 68f2134d63 is already in history

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

Change-Id: Iadabf38b76965997e73092972e0390a5cf664be9