Merge "[WIFI] Remove System APIs overlays added as part of Wi-Fi mainline"