[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: a77e246d63 am: 36be3fc81b am: 4f9e748d55 -s ours am: 35dee27490 -s ours
am skip reason: Change-Id I44a11d8d6365e32332818b08c84583c9afb5aa15 with SHA-1 f29759cd32 is in history
Change-Id: I4188221d5993820e927116c2be44d7f82871af25
This commit is contained in: