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

Change-Id: I3cfab1a64459b20195d18562a99ed448853a6fbe