[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev...
[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf167 am: a77e246d am: 36be3fc8 am: 4f9e748d -s ours
am skip reason: Change-Id I44a11d8d6365e32332818b08c84583c9afb5aa15 with SHA-1 f29759cd is in history
Change-Id: Id3eb008098420c14695f12d90398b102b6f6366c