am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev

* commit '10dff0a710b46cc1ddf554e6c83941a201aa6150':
  Re-add Connection.getCallCapabilities

telecomm/java/android/telecom/Connection.java

@@ -838,6 +838,11 @@ public abstract class Connection implements IConferenceable {
         return mConnectionCapabilities;
     }
 
+    /** @hide */
+    @SystemApi @Deprecated public final int getCallCapabilities() {
+        return getConnectionCapabilities();
+    }
+
     /**
      * Sets the value of the {@link #getAddress()} property.
      *