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

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



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