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: Iccadd3a552e9be182c71f32600675c6936b454a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>