[automerger skipped] [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 am: a8fe3a8f50 -s ours

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

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

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