Merge "sdm: Update secure_present flag when secure display is present"