[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 32fa4f2d -s ours am: bb5fe524 -s ours

am skip reason: Change-Id I7bc25bb7bd3bbfa255e399def0a786d3200bb737 with SHA-1 830cb6b3 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1521192

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf41677c8f9c6dd711cf5b621dcf28b495bc173d