DisplaySettings: fix merge derp

Change-Id: I284d9c3ec22216679a08e54bf01c5972a648df5a