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

Change-Id: I4f66ab4f3086cfbee432756af6992f3aed1cec40