Merge "Use NetworkStatsService to get stats for apps"
am: 693d8a2ab1

Change-Id: I81a28a172e69fc405e99eb9c3a4fd0c729ca613d