Merge "Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69d am: 87364693 am: 742e5df1" into rvc-qpr-dev-plus-aosp