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

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

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

Change-Id: I39b14428382682fc6b6e95295e908ed8150dcc2a