[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 am: 3870b7c3
Change-Id: Ibcba3f2e76bf8d0b070ae918ff579b73542d8ed1