[automerger skipped] Merge "Remove obsolete Smart Lock developer settings"...

[automerger skipped] Merge "Remove obsolete Smart Lock developer settings" into udc-qpr-dev-plus-aosp am: 41aed3b0 -s ours

am skip reason: Merged-In I6697b578712dfb57f9e709c541454b43e79d3a14 with SHA-1 94aedc05 is already in history

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



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