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: dbf582ef" into rvc-d1-dev-plus-aosp am: 879fe65e
Change-Id: Ied16c0cd33cd1da4d893aad7909d570a97451ec0