Merge "Add some invalid constants in Tuner HAL 1.1"