Merge "[automerger skipped] Merge "LockSettingsService: migrate to its own...

Merge "[automerger skipped] Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e54262 am: fc7a26cd am: 8f2e6345 -s ours" into sc-dev am: 3a1e0aa1 -s ours am: e0a203f9 -s ours

am skip reason: Merged-In Iac339e64812232875afa9dc6109b848b50b0ef2f with SHA-1 f53bf832 is already in history

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

Change-Id: I04f39d9e7ed406a1d8ecf052ddf0fa4ab5435bb6