Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
am: 4a8f95ba56

Change-Id: Ia71160c03ec0859cdf93082fc6ced121452a3ad6