Merge "hwc2: Add support for Secure Display"