Merge "Add additional toggleable active unlock settings" into tm-dev am:...

Merge "Add additional toggleable active unlock settings" into tm-dev am: 0dd4d731 am: 60903c58 am: 8fb9cff3

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



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