Merge "Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba am: 9de5dc9b" into oc-mr1-dev-plus-aosp