Merge "Exclude silent notifications from lockscreen" into tm-dev am: 009c9389 am: bd7a9dfe am: cedc25e1 am: 4b1d1794

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



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