[automerger skipped] Merge "Don't attach private Notification to A11yEvent...

[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865 -s ours am: f5dd6374 -s ours am: 155c60cd -s ours am: b082d717 -s ours am: 7fbcb9b9 -s ours

am skip reason: skipped by user steell

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

Change-Id: I5233a620cb45b7c24d8eb8f026d26f524f372899