Merge "Use CDS display white balance getter and setter" into qt-dev
am: 65b535f44a

Change-Id: I53943d5c4cd38964aa30254754327c8c474e39cd