Merge "Fix @Ignored test for Stylus Usi notifications." into tm-qpr-dev am: f207b4d301

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

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