Merge "healthd: add battery health status values from JEITA spec" am: 5dd87c4ef6 am: 7a79592e4e
am: 8e5671f55c

Change-Id: I9bda46d540f017393a740639c755b3a19b7dc758