Fix unwanted display of country dropdown

The default personal info template for GC doesn't need to show the
country dropdown and isn't hidden, so this fixes that

squashed with I02b4bf1aa61dd47c0a7fba60d228072012ebce80
reintroduce country field as a hidden input

Change-Id: I513605c309b83a92bea989d07ae6650158175b75