Merge "Remove obsolete Smart Lock developer settings" into main am: a1bb1ff8...

Merge "Remove obsolete Smart Lock developer settings" into main am: a1bb1ff8 am: 3b12b17e am: 728bbd56

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



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