[automerger skipped] Merge "Merge RQ2A.210305.007" am: 28c30b5ff7 -s ours am: 17cfc4f743 -s ours

am skip reason: Change-Id Ia061376a9529a5e4fdec5e9f6b87329118b8d95e with SHA-1 3c31a1b599 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1613693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6255266f233765fbe9dc94513c4ce24f334ef855