Merge src/com/android/contacts/common/ from platform/packages/apps/ContactsCommon to src/com/android/contacts/common/
am: d568c8dfd9

Change-Id: Iebeaf0e37f8662e5dcd33289151ef0c0e2bf643a