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: 613cc30b
* commit '613cc30b':
Change-Id: I7666057422fa82bf776b234090ca55111d505127