Merge "Use userId instead of USER_CURRENT in shouldLockKeyguard." into sc-dev