Merge "BatteryNotifier: attribute battery usage of video to correct uid."