[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 skip reason: skipped by user steell

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

Change-Id: Ib43b7eecdd68f7d339c95c24b25c3c1a68788c20