[DO NOT MERGE] Fallback APK without D2D changes

* Bump version
  * 33030020 -> 13-3.2
  * 33030021 -> d2d test seedvault-app#478
  * 33030022 -> This, to go back to normal build after testing
* This is to allow going back to a build without D2D safely,
  because otherwise to uninstall the update to an app you
  have to wipe data.
* Also set the testing property to false

Change-Id: I1a9530102c851ac8ea05711b947ef7390e3a0dc8

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.stevesoltys.seedvault"
-    android:versionCode="33030020"
+    android:versionCode="33030022"
     android:versionName="13-3.2">
     <!--
     The version code is the targeted SDK_VERSION plus 6 digits for our own version code.

app/src/main/java/com/stevesoltys/seedvault/App.kt

@@ -10,6 +10,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.ServiceManager.getService
 import android.os.StrictMode
+import android.os.SystemProperties
 import android.os.UserHandle
 import com.stevesoltys.seedvault.crypto.cryptoModule
 import com.stevesoltys.seedvault.header.headerModule
@@ -60,6 +61,7 @@ open class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
+        SystemProperties.set(BACKUP_D2D_PROPERTY, "false")
         startKoin()
         if (isDebugBuild()) {
             StrictMode.setThreadPolicy(
@@ -122,6 +124,8 @@ const val MAGIC_PACKAGE_MANAGER = PACKAGE_MANAGER_SENTINEL
 const val ANCESTRAL_RECORD_KEY = "@ancestral_record@"
 const val GLOBAL_METADATA_KEY = "@meta@"
 
+const val BACKUP_D2D_PROPERTY = "persist.backup.fake-d2d"
+
 // TODO this doesn't work for LineageOS as they do public debug builds
 fun isDebugBuild() = Build.TYPE == "userdebug"
 

contactsbackup/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.calyxos.backup.contacts"
-    android:versionCode="33030020"
+    android:versionCode="33030022"
     android:versionName="13-3.2">
     <!--
     The version code is the targeted SDK_VERSION plus 6 digits for our own version code.