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

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

Change-Id: I7da501b2913d93d293f9a4ac83cf04dfb0bb47e3