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: I1fa306293b88be01e868f42b70c5368fcbda1d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>