[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 skip reason: subject contains skip directive

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



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