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

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

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



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