[automerger skipped] Merge "Improve logic around battery history time base" into udc-dev am: 17fb2d86 am: c498ad44 am: d63018e0 -s ours am: f70e471e -s ours

am skip reason: Merged-In Iea5e3305f1bdc3e3fa6cb2a0d05082206aeae03c with SHA-1 5f550dc6 is already in history

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



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