Merge "health: support Dock charging" am: a366ec1a33 am: 3ab4cb982d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1946230

Change-Id: I3e3509265ebe538804bf2d3137071542a3930f4a