Merge "Merge "Make framework-wifi stubs use the new defaults" into rvc-dev am:...
Merge "Merge "Make framework-wifi stubs use the new defaults" into rvc-dev am: 3544feed am: 10e880cd" into rvc-d1-dev-plus-aosp am: 72890cc3
Change-Id: If5c4a53776313638c7c79684f73751cd6590b0bf