Merge "Consume health HAL 2.1 values from framework" am: 217aadd0c2

Change-Id: I5cf49ce94dcb28566bb37edb2583a300630f618e