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

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

Change-Id: I394eb34371d275b35444d0b7f0eacce22a0f8868