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

[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into rvc-qpr-dev am: c57b7b70 -s ours am: 09dd33e6 -s ours am: 4ec5f6d9 -s ours am: 1da6a672 -s ours

am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 54fbccc2 is already in history

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

Change-Id: Ic578ffad89e101327134b9437956d764d11d3695