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

Change-Id: Iae34ca697b0bd3a4ecf0316c3f8fb70338244c84