Merge "Fix recording of battery history tags" into tm-dev am: f19925af am: af94d058

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18202091



Change-Id: If3b1903564c363f5ab1102d14d3cfb02608dad1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>