Merge "Don't attach private Notification to A11yEvent when user locked" into sc-dev am: 1b1df331 am: 7777e2bc am: c76605f6

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

Change-Id: I029073044da639f81bd0317d5ef999af63454d87