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

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

Change-Id: I029b2fb5e21647ae15c6b31a153fc3ac87380113