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

Change-Id: Ib99f494e0af49d9ad6b0df8a17538fbc80b48df8