Merge "Merge "Use userHandle not credentialOwnerUserId to check if it needs to...
Merge "Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev am: ca34ab06 am: 3bb6351a" into nyc-mr1-dev-plus-aosp
am: e5af6efa
* commit 'e5af6efa':
Change-Id: Ia06fe0d4e928b30644e3320d3355e46daa860a4a