Merge "Fix HdmiCecLocalDevice concurrent access"
am: 549082991d

Change-Id: I86dba1aa8ee360d5f813d3108902d6affd74b13f