Merge "hwc: set the secure flag for AD when secure content is present"