Collapse common package (2/2)

Ran optimize imports on the project as well to re-order everything
which would have changed because of removing common.

Test: Built GoogleContacts, GoogleContactsTests, Contacts,
ContactsTests and ran unit tests.

Bug: 33252370
Change-Id: I881f0ba8b8fef002b6eeefa9a16b34f15b2fd2a9