Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 0f19f99c am: b5b5ebd1 am: 9e1ab88b Change-Id: I0e7322090364fc1724797641276416c07277d0bc