[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 skip reason: subject contains skip directive

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

Change-Id: Ib7060fcc1364faf606a5a467e0bd9d2538a1270a