[automerger skipped] Merge "Fix NPE in TouchpadDebugViewController" into main...

[automerger skipped] Merge "Fix NPE in TouchpadDebugViewController" into main am: ad3fe419 -s ours

am skip reason: Merged-In I4dc7de5fcc05fe20cc17c1540bbef2b1d78c6465 with SHA-1 3556310b is already in history

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



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