Merge "[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev am: 075e4bbb -s ours am: cbe9be1e -s ours am: 7253e1ee -s ours am: da74491f -s ours am: ccc41f44 -s ours am: 21b7dae4 -s ours am: 544f54cd -s ours am: 984f061e -s ours" into sc-v2-dev-plus-aosp am: 71643d9b -s ours

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

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

Change-Id: Ibc893de072446f4d34f9e8cb886d1550d0655a2e