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

Change-Id: I75cafc7f4eac5a8e77b2491cc85f183866f11546