Merge photo dialogs into one. Hide "Use this photo" if not necessary

Renamed "icon" consistently to "photo"

Bug:3113345
Bug:2183730

Change-Id: I32cffc31b5ee425e6622db30b5199871e91337e1
5 files changed