Merge stage-aosp-rvc-ts-dev into rvc-dev

Bug: 148878042
Merged-In: I7fe1545a4255ad3a476cb60b702a02b666a9954e
Change-Id: Ia3d51e6653b8914aa90cc2b68e28c6bddc76ce77
diff --git a/gnss/V2_1/target/AndroidTest.xml b/gnss/V2_1/target/AndroidTest.xml
index 9efcfe3..b91c23a 100644
--- a/gnss/V2_1/target/AndroidTest.xml
+++ b/gnss/V2_1/target/AndroidTest.xml
@@ -26,6 +26,6 @@
         <option name="binary-test-type" value="gtest"/>
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="15m"/>
     </test>
 </configuration>