[automerger skipped] Merge "Merge Android R" am: 7bddc5a9 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 7bddc5a9 -s ours am: e6a92a64 -s ours am: 29911e94 -s ours am: 5ec0ee26 -s ours am: 22088b81 -s ours

am skip reason: Change-Id I3a68890be6d2c62299703dea85b8aad11771e5bc with SHA-1 0b2dbb46 is in history

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

Change-Id: Ida270f203b9b8c05b7bb35dff5b98a7ae9445e01