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