[automerger skipped] Merge "RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi" am: 04efd3aeda am: adaa9fc527 -s ours am: cf25ad70c6
Change-Id: Ic68eab4086dce338a19eefdebed5da5fd8544194
This commit is contained in: