Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached."