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 am: a9979c2c
Change-Id: Ib436d08a2c162406f9dbb476e727e66f149e52de