Merge branch 'debug-build-alongside-beta' into 'master'

Make debug builds installable alongside official beta build

See merge request !582

briar-android/build.gradle

@@ -82,11 +82,15 @@ android {
 		versionName "0.16.8"
 		applicationId "org.briarproject.briar.beta"
 		resValue "string", "app_package", "org.briarproject.briar.beta"
+		resValue "string", "app_name", "Briar Beta"
 		buildConfigField "String", "GitHash", "\"${getGitHash()}\""
 	}
 
 	buildTypes {
 		debug {
+			applicationIdSuffix ".debug"
+			resValue "string", "app_package", "org.briarproject.briar.beta.debug"
+			resValue "string", "app_name", "Briar Debug"
 			shrinkResources false
 			minifyEnabled true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'

briar-android/src/main/res/values/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string translatable="false" name="app_name">Briar Beta</string>
 
 	<!-- Setup -->
 	<string name="setup_title">Briar Setup</string>