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: 8ff55754 am: 47eaed37

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



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