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

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

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