Merge "Increase check to switch USB device to AOAP timeout" into rvc-qpr-dev
diff --git a/car-usb-handler/src/android/car/usb/handler/AoapServiceManager.java b/car-usb-handler/src/android/car/usb/handler/AoapServiceManager.java
index 04bef87..f0656aa 100644
--- a/car-usb-handler/src/android/car/usb/handler/AoapServiceManager.java
+++ b/car-usb-handler/src/android/car/usb/handler/AoapServiceManager.java
@@ -55,9 +55,7 @@
 
     private static final int MSG_DISCONNECT = 1;
     private static final int DISCONNECT_DELAY_MS = 30000;
-
-    private static final int INVOCATION_TIMEOUT_MS = 5000;
-
+    private static final int INVOCATION_TIMEOUT_MS = 20000;
 
     private final HashMap<ComponentName, AoapServiceConnection> mConnections = new HashMap<>();
     private Context mContext;