Merge "Filling in holes in shade touch handling logging" into udc-dev am: 6b476d8b am: 220ca896

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



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