Merge "Validate display white balance matrices" into qt-dev
am: 6ad383519d

Change-Id: Ic31979721e1923343cc7dbe066653ff1597588f4