Merge "Consume health HAL 2.1 values from framework" am: 217aadd0c2 am: 28c43860ea am: 8f9d77ae03

Change-Id: I60f9cee5e0ba74349a0448204b0e31d213151e5f