Merge "Populate fields for health HAL 2.1 + batteryCapacityLevel + batteryChargeTimeToFullNow" am: 223fa17c2e am: ccf55fdf04

Change-Id: I5bb566ac3c8fcd94ad9ccc998cea9c877b0c5bc3