Merge "Add UNSUPPORTED to health HAL 2.1 values" am: 9d261c3fed

Change-Id: I18dc62b92725d3061772d5069558af688a99573b