Resolve merge conflicts.

# Conflicts:
#   briar-android/src/main/res/values/strings.xml
1 job for 1565-strings-duplicate-handshake-links in 8 minutes and 15 seconds (queued for 7 minutes and 3 seconds)