Fix uploading multiple images with same title from Flickr

When an image is identified with same title in a set, generate a
unique name using the title and id.

Bug: 43320
Change-Id: If1b7af30a8daf84be0d5b388c8f37e0595145675
Merge "Fix uploading multiple images with same title from Flickr"