Merge "Remove android.hardware.wifi from generic_system.mk" into main am: f8e79f11

Original change: https://android-review.googlesource.com/c/platform/build/+/3030463



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