Merge "health: vendor.charger-* -> vendor.charger." am: 71af5c2da9 am: 91484f8aef

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

Change-Id: Iaa5e26a2b3db982e57f908aecc87a91a546a411e