Merge "RESTRICT AUTOMERGE Enable Stylus Update Notification feature" into tm-qpr-dev am: 02e49c21

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



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