[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: c38cbf85 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a1ee136b4caf551a4b47c7ae86003940b99bd7e