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

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



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