Merge "Exclude silent notifications from lockscreen" into tm-dev am: 009c9389 am: 6987f154

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



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