Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf167 am: a77e246d am: 36be3fc8 Change-Id: I91e16735b173a90532234ed8acc619ecce4c3265