[automerger skipped] Merge "Merge RQ2A.210305.007" am: 732f67ab4d -s ours am: 21118fb776 -s ours

am skip reason: Change-Id I95901ed724ecb331202faf472f41df2519f85460 with SHA-1 dd8ba43a54 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c2e3d7363382200dd2186c35d0d8aa64610bdb3