[automerger skipped] Merge "RESTRICT AUTOMERGE Flip "track_stylus_ever_used"...

[automerger skipped] Merge "RESTRICT AUTOMERGE Flip "track_stylus_ever_used" feature flag to unreleased" into tm-qpr-dev am: 21c896d4 am: ea62b9a5 -s ours am: 19ca18b4 -s ours

am skip reason: subject contains skip directive

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



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