Merge "Add existing ro.hdmi sysprop to sepolicy"