Merge "Add CTS support for DENSITY_450 and DENSITY_600" into qt-dev am: 097aae205b am: 87ab56eef3
am: a07901456a

Change-Id: I758ff64d282b87dc6e232b6a4d92041e0175d08d