Merge "Improve logic around battery history time base" into udc-dev am: 17fb2d86

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



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