am fb636408: Merge "Contact icon cannot be replaced when set from gallery."

* commit 'fb6364087e42fe92c39147b3346c2d321186fadd':
  Contact icon cannot be replaced when set from gallery.