[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: a77e246d63 am: 1a5be56870 am: d254997c7b -s ours
am skip reason: Change-Id I44a11d8d6365e32332818b08c84583c9afb5aa15 with SHA-1 472379623c is in history
Change-Id: I2f7d43310f8ecf0f0af665c271c6ca6ce9763bf8
This commit is contained in: