[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865c9 -s ours am: f5dd6374a3 -s ours am: 155c60cda4 -s ours

am skip reason: skipped by user steell

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

Change-Id: I5ef4a5ef5f60a0b978640a60f51354e7fc3fe4bf