Merge "Ensure current user is used when setting the PhoneAccountSuggestionService." into main