Bobbi Kristina -- Grandma FOLDS In War Over $20 Mil Inheritance

Bobbi Kristina's grandmother Cissy Houston has BACKED OFF her attempt to keep Whitney Houston's money from Bobbi Kristina for years -- we found out Cissy has settled her beef with BK. TMZ broke the story ... Cissy and Pat Houston (co-executors of…