Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382 am: 7fa15840a8 am: 55cd97f94c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia73cdbf546322a3579e384cc61e2076483d068df