[automerger skipped] Merge "Don't leak input events to dumpsys on user builds"...

[automerger skipped] Merge "Don't leak input events to dumpsys on user builds" into oc-dev am: ff849d65 am: 99b29295 am: d2a3e9b3 -s ours am skip reason: skipped by user ashfall am: 2fd951b6 -s ours
am skip reason: Change-Id I98c9c375f18963177bf0c1d8829a217b4ad4acc6 with SHA-1 a70a3ff7 is in history

Change-Id: I5507b4a1cae54e14bf3ea3930494f892880a269e