[automerger skipped] Merge "New API methods to access external battery info"...

[automerger skipped] Merge "New API methods to access external battery info" into sc-dev am: 2b686e85 -s ours

am skip reason: Change-Id Iba59fc9a259818b03c24ee8c2c49601952ed65a3 with SHA-1 44b91077 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83376a4c954805b9abed3b6a0f905cf5d771c55c