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

[automerger skipped] Merge "RESTRICT AUTOMERGE Disable Stylus Update Notification feature" into tm-qpr-dev am: dc00a732 am: 822186bb -s ours am: f5775880 -s ours am: 56b7de51 -s ours

am skip reason: subject contains skip directive

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



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