Merge "InputFlinger: fix a typo in dump error log" am: 8bae3798cb
am: 1a5aba333e

Change-Id: I56f9ac03b84eb71ad350c2c378b9ad0b5b25278d