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

Change-Id: I09f44e30776b9baf576512b643614e18d0759235