Merge "Add additional toggleable active unlock settings" into tm-dev am: 0dd4d731 am: d48af702

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



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