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

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

Change-Id: I4a82c1031acc10b22eb7ee9bd3a875035979aa11