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

Change-Id: I4f2e0e45ef21c7fb23575e66eae11b3eb1e6607b