Merge "Exclude silent notifications from lockscreen" into tm-dev am:...

Merge "Exclude silent notifications from lockscreen" into tm-dev am: 009c9389 am: bd7a9dfe am: 151ebf6c

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



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