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

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



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