Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev