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

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



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