[automerger skipped] Make LockSettingsService enforce basic requirements for...

[automerger skipped] Make LockSettingsService enforce basic requirements for new credentials am: f258e777 am: d1ccacac am: bdb01278 am: cebe5c46 am: 504a1bfb -s ours

am skip reason: Merged-In Icc48a0d6caac0884bf3e3a9181828e8dfffff7e4 with SHA-1 fe59a023 is already in history

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



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