Merge "Update eventlog tags for WifiStateTracker"