Merge "BatteryStateNotifier: Update PendingIntent flag"