Merge "CEC: Make TV try to dispatch the message first" am: aa3970209e
am: bea3ddf9de

Change-Id: Ia05bb1395ef854f03d3f4165fc3f0abf922407c8