[automerger skipped] Merge "RESTRICT AUTOMERGE Enable Stylus Update...

[automerger skipped] Merge "RESTRICT AUTOMERGE Enable Stylus Update Notification feature flag" into tm-qpr-dev am: 43d058a5 am: 654056be -s ours am: aa1752a0 -s ours am: 2b07a4b3 -s ours

am skip reason: subject contains skip directive

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



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