Improve logic around battery history time base

Bug: 280079024
Test: atest FrameworksCoreTests FrameworksServicesTests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:707dcfb6b4e715e7e1d8e4d4b3e98e837b4d203d)
Merged-In: Iea5e3305f1bdc3e3fa6cb2a0d05082206aeae03c
Change-Id: Iea5e3305f1bdc3e3fa6cb2a0d05082206aeae03c
3 files changed