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