Merge "Expose capabilitiesToString for use in Telecom." am: b7d9e55bc7

am: b9cdc48c1f

Change-Id: Ib35d4013fe5f7e7a1a34d9e74eae1b7e642f0a26

telecomm/java/android/telecom/PhoneAccount.java

@@ -985,10 +985,10 @@ public final class PhoneAccount implements Parcelable {
     /**
      * Generates a string representation of a capabilities bitmask.
      *
-     * @param capabilities The capabilities bitmask.
      * @return String representation of the capabilities bitmask.
+     * @hide
      */
-    private String capabilitiesToString() {
+    public String capabilitiesToString() {
         StringBuilder sb = new StringBuilder();
         if (hasCapabilities(CAPABILITY_SELF_MANAGED)) {
             sb.append("SelfManaged ");