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

am skip reason: subject contains skip directive

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



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