Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" into sc-dev