Merge "Remove some hdmi ro properties" am: 5bfe628d0b

Change-Id: I36a98d731ec7e78f282ac3940274b90104521b70