Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740

Change-Id: I6d9654326dd00d287470c4260cba03e5aba1d66b