[automerger skipped] Merge Android U (ab/10368041) am: b09332f17f -s ours am: fa8224e5f5 -s ours am: 5c98bc336f -s ours

am skip reason: Merged-In I844532ebf0ed90a99a92ee22b7f06188795d1135 with SHA-1 42d98eb9f4 is already in history

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

Change-Id: I4aab3d4f2ff672387917cdcb89a65c7699b62c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 5aa9d37e9aed96c8a3e8dd70bb8767d74f3a0329
  1. legacy/
  2. wcn6740/
  3. Android.bp
  4. Android.mk
  5. METADATA
  6. OWNERS