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

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

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



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