Merge "[SP10] Add IntDef annotations for system api of NetworkStats"