Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on...

Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""" into sc-dev am: 2b9f139a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8bdd8673766b0dcf2d7bd0750d3d7845ffafc76