Merge \"SysUI: Protect against crash in BatteryController\" into nyc-mr1-dev
am: 3750c9a15a

Change-Id: Idc0701fd53702bc2f0a4c4e4cb3173393cb24fa7