[automerger skipped] Merge "Don't leak input events to dumpsys on user builds" into oc-dev am: ff849d65da am: 99b292950f am: d2a3e9b37e -s ours
am skip reason: skipped by user ashfall

Change-Id: Ia6132322a0aaebe677e80922c7cea9b143da49a6