Merge "BatteryService: support Dock charging" am: 0d692ed940 am: 051db486c8 am: c77c261f95 am: 5502d9f7a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1946294

Change-Id: I231b3a1fd54b7cdc1e2b5824a6fb35f88166812d