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

* commit '3cc05c9d7e290b7e6ff10c3428c471b8e2529f2c':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs