Merge "Integrate IKeystoreUserManager aidl with LockSettingsService."