[automerger skipped] Merge "Add EBS interface to BatteryController" into...

[automerger skipped] Merge "Add EBS interface to BatteryController" into rvc-qpr-dev am: 05afc4f4 am: c421452c -s ours

am skip reason: Change-Id Ie450194ee34b319cff926a49aca99544dcca0e9c with SHA-1 c553798e is in history

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

Change-Id: Ie637d3669ccc3a3e65a469b64985bc1c5f7b9019