Merge "Improve MediaButtonReceiverHolder toString()"

    @Override

    @Override

    public String toString() {

    public String toString() {

        if (mPendingIntent != null) {

        StringBuilder sb = new StringBuilder();

            return "MBR {pi=" + mPendingIntent + ", type=" + mComponentType + "}";

        sb.append("MBR {pi=").append(mPendingIntent);

        }

        sb.append(", componentName=").append(mComponentName);

        return "Restored MBR {component=" + mComponentName + ", type=" + mComponentType + "}";

        sb.append(", type=").append(mComponentType);

        sb.append(", pkg=").append(mPackageName);

        sb.append("}");

        return sb.toString();

    }

    }

    /**

    /**