Merge "Do not wake from stylus buttons when disabled" into udc-dev am: 7491657c am: 0a3ffdcb

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



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