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

am skip reason: Change-Id I066513ca03329aae88f4b984d6882c10842bc163 with SHA-1 3081c7c8ce is in history

Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/1613697

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35271e4c4acf15bbcfbff2859d2b7e374dc88bd4