Merge "hwc: remove local constant DISPLAY_ATTRIBUTES list"