Merge "health: properly support charger mode." am: 21c1e163d4 am: d9964bb31a

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

Change-Id: I07f1661448c9229e4c2d906abc4903d481ccc940