Merge "Update .rc for hostapd in vendor apex" into main