[automerger skipped] Merge "Flip stylus first use detection flag." into...

[automerger skipped] Merge "Flip stylus first use detection flag." into tm-qpr-dev am: 86d32346 am: 9421540a -s ours

am skip reason: Merged-In Ied6d3b6d00b6c9bbad250febe0381fbef2f0e607 with SHA-1 ee5210b1 is already in history

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



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