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

* commit '12e42ba225cf6c38eaf752f55a22ce6296d2343c':
  Remove uids with empty history from NetworkStats uid enumeration