Merge "Add API for SHELL command to set the capabilities request timeout." am: 49ec135724 am: 301caad026

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1719881

Change-Id: I2564fcf3667c58cd4b40f0ed7c29999ccd3f2507

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -2439,6 +2439,12 @@ interface ITelephony {
       */
     boolean removeUceRequestDisallowedStatus(int subId);
 
+    /**
+     * Set the timeout for contact capabilities request.
+     * Note: This is designed for a SHELL command only.
+     */
+    boolean setCapabilitiesRequestTimeout(int subId, long timeoutAfterMs);
+
     /**
      * Set a SignalStrengthUpdateRequest to receive notification when Signal Strength breach the
      * specified thresholds.