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

Change-Id: Ia55bb48fdb2cf42de2c67752ffc382b06d29a5bd