[automerger skipped] Merge "RESTRICT AUTOMERGE Enable Stylus Update Notification feature" into tm-qpr-dev am: 02e49c2100 am: 0be446496d -s ours

am skip reason: subject contains skip directive

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

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