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

[automerger skipped] Merge "Remove obsolete Smart Lock developer settings" into main am: a1bb1ff8 am: 3b12b17e am: 728bbd56 am: 1885505c -s ours

am skip reason: Merged-In I6697b578712dfb57f9e709c541454b43e79d3a14 with SHA-1 0abf04ae is already in history

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



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