Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 0f19f99cf6 am: b5b5ebd1a9

Change-Id: Icc69f682437baf209aa537820201be45db6ccf3a