Merge "Add AOD metrics in batterystats" into oc-mr1-dev am: 6204a60c53
am: 8cb8bdf657  -s ours

Change-Id: I1a25b4b0854d8f511bf4fd8d9f8295ed5695e9b4