But on Friday night, the mother-daughter duo appeared to be working through the tension as they stepped out for dinner at celeb-favorite A.O.C. in Brentwood