Merge "RESTRICT AUTOMERGE Enable Stylus Update Notification feature flag" into tm-qpr-dev am: 43d058a5

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



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