Handle DEMOTE and UNDEMOTE in CP2

* If a contact is UNDEMOTED, if it was previously DEMOTED, it will
become UNPINNED. Otherwise, it will remain unchanged.

* When two raw contacts are aggregated, the parent contact should
inherit the lower pinned position of the two, not including negative
integers.

Change-Id: I74f41dfa327b8e5a79688b1e99eafbef7d9d58a0
3 files changed