Merge "Make framework-wifi stubs use the new defaults" into rvc-dev