Refactor Contact-Editor and Contact-Viewer.

Bug:2579760

Change-Id: Id61cc6fbc2b4def72df012cca3ac3c0185b583bb
12 files changed