[automerger skipped] Merge "RESTRICT AUTOMERGE Disable Stylus Update Notification feature" into tm-qpr-dev am: dc00a732f7 am: 822186bbe4 -s ours am: f577588031 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22077382 Change-Id: I7e5bb20d84166554c96162aebe35eee7f5b263fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: