Merge "Wifi: Remove hostapd hidl entry from manifest.xml"