[automerger skipped] RESTRICT AUTOMERGE Use HdmiProperties class for all...
[automerger skipped] RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi am: 36b8f991 am: 12c27fc9 -s ours am: a275ab8a am: f0c5b974
Change-Id: If572726d1d2005e36eac1d4be255352f55876aa0