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

* commit 'ca34ab06eca921f8c193dfa7d0b500b6892890e6':
  Use userHandle not credentialOwnerUserId to check if it needs to show lock

Change-Id: I0015c35a2f4b024c22f9bf2e2d43dc6ca25db046