Merge "Use HdmiProperties class for ro.hdmi.device_type" am: b4a43d8786

Change-Id: Ib7cc145f35d8c72d82538bcd5232df81d7feabff