Merge "Add extra info to BATTERY_LEVEL_CHANGED broadcast."