[automerger skipped] 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 am: 2eb71a82 -s ours
am skip reason: Change-Id I36cf007a4813027721dfb6389e10cf95085f85e4 with SHA-1 6656c50d is in history

Change-Id: If9d91956e2dadbfbd7a0d7e5d7922e9cfb767dc8