[automerger skipped] Merge ab/7061308 into stage. am: 17a0536003 -s ours am: a2dd8ce5af -s ours

am skip reason: Change-Id I3cd1f27c5fb2df7fcd433c2c47b42e5660ff9326 with SHA-1 6a8e195cd6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bdcde76aca386a55a9bcc022ebed61c565271f9