Merge "Make framework-wifi stubs use the new defaults" into rvc-dev am: 3544feed am: dbf582ef am: 5063a4ed Change-Id: Iab783fee4c916c424a4414762a1e1b7b9edb5433