[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: c7f1f024 -s ours

am skip reason: subject contains skip directive

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



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