Merge "Merge "[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into qt-dev am: 97626673 -s ours am: f39c2687 -s ours am: 5352a08a -s ours am: 5a6ceba0 -s ours" into sc-dev am: c508a3cd -s ours am: 23d25f4f -s ours" into sc-v2-dev-plus-aosp am: b1c0e2c7 -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/+/15080911

Change-Id: I4eaeddbf7e2928d2a7829f3ee72152138fe37bc7