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

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

Change-Id: Id09208738a1629ae47427e4391b9ff6a00ec1834