Merge "hwcomposer: Add HWC_DISPLAY_SECURE as a dpy attribute"