Merge "Ensure notifs are filtered when device is locked" into tm-dev am: d9cefd34

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



Change-Id: I35f1e0ddb30d8c1f792efe9a1a182b553991daa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>