Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent" into pi-dev
am: f3375f360e

Change-Id: I7bb7027ef986e087fec2e3726eb91f930ce9d6c7