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

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



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