[automerger skipped] Merge "Remove ro.hdmi.wake_on_hotplug" into rvc-dev am:...
[automerger skipped] Merge "Remove ro.hdmi.wake_on_hotplug" into rvc-dev am: c8d30126 am: 69c67e74 -s ours
am skip reason: Change-Id Ifd06566d958ef1b08aa84012366b4641ee5032f7 with SHA-1 3013714b is in history
Change-Id: I915249d25f2ab34b0ff5745c36ef63ccfd584fba