Merge "Fix HdmiCecLocalDevice concurrent access" am: 549082991d
am: 1494c01109

Change-Id: I74f59f35e1d78bdd9dcef57a939ec7a7af625049