[automerger skipped] Merge "RESTRICT AUTOMERGE Use HdmiProperties class for...
[automerger skipped] Merge "RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi" am: 04efd3ae am: adaa9fc5 -s ours am: cf25ad70
Change-Id: Ic68eab4086dce338a19eefdebed5da5fd8544194