Merge "Add traces for touch events and fix trace naming" into sc-dev am: 82555529 am: be453c5d am: 3adc8195

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

Change-Id: Id5243684c0fa3bec55134f1c20089228304c6037