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

Change-Id: Ia5ecee02a2424d895f344a7c22f08d50bb076218