Merge "framework-wifi-test-defaults: use framework instead of framework-minus-apex"