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

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



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