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

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



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