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

Change-Id: I508891330306fe23e4ab66367bea3f5b2c045dea