Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2551fe11fa77c342264a199b9509c6f1551ece9