Merge "Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev am: 580f8276 am: 7ec42d50" into rvc-d1-dev-plus-aosp