[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 skip reason: subject contains skip directive
Change-Id: I7e937c8b0f361e766aaf39b6d6a8285ad8c7729c