Merge "RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi" am: 04efd3aeda

Change-Id: Ie707d0d7ba875ffc54769ddbcaa396e97e4f98a6