Merge "Give BatteryStatsViewer the INTERACT_ACROSS_USERS permission"