Merge "Default to hiding silent notifications on lockscreen in Settings" into...

Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426



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