android: Add fields for local and remote identities to data model