[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: fb79f914af am: 5e76e92a34 -s ours am: e127de89e4 -s ours
am skip reason: Change-Id I44a11d8d6365e32332818b08c84583c9afb5aa15 with SHA-1 f29759cd32 is in history
Change-Id: I18db7afb55ac5d07f1670dda2358ca62d2ec87f8
This commit is contained in: