[automerger skipped] Merge RQ2A.210305.007 am: cc962cc1ce -s ours

am skip reason: Change-Id Ice15549db37aaffa597013e22274cca76e0146bd with SHA-1 96c796a5e9 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1613665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1475d4ed06bde17d1a79bb011592a98ddc5dfc22