Merge "Add UNSUPPORTED to health HAL 2.1 values"