am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

* commit '31638de30564d5b5fdc4177227cdab6df681ecfc':
  Remove uids with empty history from NetworkStats uid enumeration