Merge "fs_mgr: fs_mgr_update_verity_state cleanup"