Merge "Refactor fs_mgr_update_verity_state()" am: 5272f9b017
am: 99331422e0

Change-Id: I690b9394f64137a7353fbba4cfca456760553e21