Merge "health: fix vts setChargingPolicy failing"