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

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



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