Merge "Break out battery history reading into a separate class" into sc-dev am: cda90b4c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2573b6d62aa2b9342df3f690346326d60487d44