[automerger skipped] Merge "[DO NOT MERGE] Switch stylus-related flags to ON."...

[automerger skipped] Merge "[DO NOT MERGE] Switch stylus-related flags to ON." into udc-dev am: c95fc096 am: 1df7de08 -s ours

am skip reason: subject contains skip directive

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



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