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

Change-Id: I9d7947be84d0fe34fcc7326c9bf551a418ffcec1