Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev
am: ca34ab06
* commit 'ca34ab06':
Use userHandle not credentialOwnerUserId to check if it needs to show lock
Change-Id: I0015c35a2f4b024c22f9bf2e2d43dc6ca25db046