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

[automerger skipped] Merge "RESTRICT AUTOMERGE Enable Stylus Update Notification feature" into tm-qpr-dev am: 02e49c21 am: 0be44649 -s ours am: 96490c82 -s ours am: 2c3f3eca -s ours

am skip reason: subject contains skip directive

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



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