Fix an NPE in PhotoSelectionHandler. mListener was always null

 - Also fixed an independent crash when replacing a photo from Details
 - Also renamed mListener in ContactEditorFragment to avoid name shadowing

Bug:6387900

Change-Id: I000009c6c8d4ea4a07168f99530e4ef1f648a333