[automerger skipped] Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent" into pi-dev am: f3375f360e
am: 358ff5d2bf  -s ours

Change-Id: I2bdc2cd9dd87000e9273cac8e00438477ad739e2