Better wording when choosing photo from PhotoSelectionActivity.

When there is already a photo for a contact, "Take photo" and
"Select photo from Gallery" don't sound as good as "Take new photo"
and "Select new photo from Gallery".

Bug: 5738108

Change-Id: I43e13774079695b0ecebc5d67576e2ea831706a0