Both user.whoami and user.query call the same wire formatting code, but expect different data.

Don't try to add availability data to user.whoami.

Stop adding email data to user.query. We've added it since D11791, but my intent was for it to be exposed only via user.whoami (i.e., expose your address, not others').

• Called both methods.
• Saw emails on user.whoami.
• Saw availability on user.query.