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

Change-Id: I297e11670c1fe5893f1d81ab5b6ef6ae6e181b82