Merge "Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev am: 580f82768c am: 649bf1a694" into rvc-d1-dev-plus-aosp am: c930f9c133 am: dca7d8d7db

Change-Id: Ic6072e1a6a228d1d5489e5bba1bdeab2f44fc890