Merge "Add additional toggleable active unlock settings" into tm-dev am: 0dd4d73142 am: d48af70290 am: 0a46f4429a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18173162 Change-Id: If11679b32101eb150cba50e34c94bd5a60c86fce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: