Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266

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

Change-Id: Ibc8bdbcf832b90e3a5628829a6206374c9504374