Group non-phone and email fields together on compact editor

Bug 22228718

Change-Id: I561ee25bad95a716744ba7d74fb6b49463b029da
2 files changed