Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl"