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

Change-Id: I9431669571325c2a3be6efdc2593ff1a26a54a83