Merge "Add existing ro.hdmi sysprops to sepolicy"