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

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

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



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