Merge "[automerger skipped] Merge "Re-submit "Create all variants of stubs for...

Merge "[automerger skipped] Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69d am: 81673c7f am: 2461d89f -s ours am skip reason: Change-Id I36cf007a4813027721dfb6389e10cf95085f85e4 with SHA-1 6656c50d is in history" into rvc-qpr-dev-plus-aosp am: 36536a9e -s ours
am skip reason: Change-Id I36cf007a4813027721dfb6389e10cf95085f85e4 with SHA-1 6656c50d is in history

Change-Id: I71a035123fe087f91ee97f9625caa312bfb086f6