Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84
am: 63959bae98

Change-Id: I0f2c802fb797541f9a4431f1d798ea9f0f1332c0