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

Merge "[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865 -s ours am: f5dd6374 -s ours am: 155c60cd -s ours am: b082d717 -s ours am: 7fe81339 -s ours" into sc-dev am: c048559e -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/+/15081022

Change-Id: I9cce265552a77214880e563bb7d94d434d627c06