RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi am: 36b8f991e1

Change-Id: Ib4e587751012010a206587ac582c0286fe54f6fc