Re-order contact edit KEYS and state save/restore to match member order

This will make subsequent CLs which will move these to base classes
easier to read.

No KEYS or save/restore's were removed or added, except
KEY_SHOW_JOIN_SUGGESTIONS was renamed to more closely match the member that
it is backing.

Bug 19124091

Change-Id: I3557cffa37ee29fc5cd460a8e7358142c383967a
1 file changed