Merge "Don't leak input events to dumpsys on user builds" into oc-dev am: ff849d65da am: 99b292950f

Change-Id: I07ffda92bd50d2f6f366ec9c2742825812e7195c