Merge "BatterStatsManager: Remove "flag" for wifi IntDef's"