Merge "health: fix vts setChargingPolicy failing" am: 5d07cebba1 am: 6680f3242b

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

Change-Id: Ia191f55d40fc4f4d66155248031b11c4780734ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>