Merge "Add traces for touch events and fix trace naming" into sc-dev am: 82555529 am: 3d40fa2f am: 0418314c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14977408

Change-Id: I73e03aa9dda9fa2dfeff045b7658b92eace295da