[automerger skipped] Merge "Use HdmiProperties class for ro.hdmi.device_type"...
[automerger skipped] Merge "Use HdmiProperties class for ro.hdmi.device_type" am: b4a43d87 am: d92e50d1 -s ours
am skip reason: Change-Id Iff969f5f698d1308842dc91ef55220eb002b1244 with SHA-1 4797b7c1 is in history
Change-Id: Ib79aab76dd5cead3a2269cabcd83ea66e540adc2