[automerger skipped] Merge 10952656 am: 6449edca35 -s ours am: 12aeb8d8a5 -s ours

am skip reason: Merged-In I7dd486ed2d1a759cefce3c6942bcb7c5e4d4b002 with SHA-1 220ec2a111 is already in history

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

Change-Id: Ie005e36ada1a601fac4503690065841b952c3490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>