Merge "Merge "Ensure notifs are filtered when device is locked" into tm-dev am: d9cefd34 am: 943264f9" into tm-d1-dev-plus-aosp am: 956db30e

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



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