Merge "fs_mgr: retrofit VAB update after A/B calc COW space." am: e78ca07631 am: a6ebcad2e5
am: afae2143c3

Change-Id: I1d8a7f412332a34dfb97e84512b57abb7986c458