[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev...
[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf167 am: fb79f914 am: 5e76e92a -s ours
am skip reason: Change-Id I44a11d8d6365e32332818b08c84583c9afb5aa15 with SHA-1 f29759cd is in history
Change-Id: I7d08d872e635aad81dd8b3c0c66f2eb5d3c1cb0e