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

Change-Id: Ib095648e098b71c5821db25ec99bdac47de6aed3