am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev

* commit '11d1caede255fe9643692974031fb93448adbd97':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs