[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into rvc-dev am: abd2fc4b39 -s ours

am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 40574b3207 is already in history

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

Change-Id: Iaf5e850e789766215fa2b9d8047b95ea2313e6da