Merge "[automerger skipped] [conflict] Merge "Do not send AccessibilityEvent...

Merge "[automerger skipped] [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b am: a8fe3a8f -s ours am: 87755b71 -s ours am: e718b4ef -s ours am: cc809ffb -s ours am: af7787b5 -s ours am: 64d1908b -s ours am: 2e13e27a -s ours" into tm-d1-dev-plus-aosp am: 2597038c -s ours am: b5aa6606 -s ours

am skip reason: Merged-In I62a875e26e214847ec72ce3c41b4f2fa8e597e07 with SHA-1 18f2ec86 is already in history

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



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