Merge "Increase the test timeout" into main am: 308bcbea8e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342095

Change-Id: I8cf8374f3cae4f188594ade50ededc6bd3d8f7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libsnapshot/snapuserd/Android.bp

@@ -169,7 +169,7 @@ cc_binary {
     recovery_available: true,
 }
 
-// This target will install to /system/bin/snapuserd_ramdisk 
+// This target will install to /system/bin/snapuserd_ramdisk
 // It will also create a symblink on /system/bin/snapuserd that point to
 // /system/bin/snapuserd_ramdisk .
 // This way, init can check if generic ramdisk copy exists.
@@ -265,6 +265,10 @@ cc_test {
                 name: "force-no-test-error",
                 value: "false",
             },
+            {
+                name: "native-test-timeout",
+                value: "15m",
+            },
         ],
     },
 }