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