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

Change-Id: I2485a5dddd8ca224debac609ecbd8f91eaecb2c4