[automerger skipped] Merge "Don't leak input events to dumpsys on user builds" into pi-dev am: 6f548dc84c -s ours am skip reason: Change-Id I98c9c375f18963177bf0c1d8829a217b4ad4acc6 with SHA-1 a70a3ff7f2 is in history am: 92aa0bafa9 -s ours
am skip reason: Change-Id I98c9c375f18963177bf0c1d8829a217b4ad4acc6 with SHA-1 a70a3ff7f2 is in history

Change-Id: I2beace75e437c931b49396ff73fe451594082690