Merge "Filling in holes in shade touch handling logging" into udc-d1-dev am: 0aacb85b

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



Change-Id: Ib9cadb4638c9bd17f5399ca110bc7013a54c8476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>