Merge "Introduced the DefaultAccountAndState class in the ContactsContract class." into main