Merge "cts: make illuminant2 keys optional" into nougat-cts-dev