[automerger skipped] Merge "Merge RQ2A.210305.007" am: 732f67ab4d -s ours am: 21118fb776 -s ours am: aea08b6513 -s ours am: 0d239d3aa5 -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: I5543c4bb6afa91fac12dd6a1ef0e0861ebbd7c84